From 9e8ba70d6905a7d7ddb45307ca06a1d627490480 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 28 Apr 2017 22:26:32 +0100 Subject: [PATCH] build: Add common flags to GDK backends The common compiler and linker flags control, among other things, the default visibility of symbols; without them, we leak symbols that ought to be private. --- gdk/broadway/meson.build | 7 ++++++- gdk/wayland/meson.build | 3 ++- gdk/x11/meson.build | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build index b80e134d16..666fb6a0bd 100644 --- a/gdk/broadway/meson.build +++ b/gdk/broadway/meson.build @@ -35,7 +35,12 @@ gdk_broadway_deps = [shmlib] libgdk_broadway = static_library('gdk-broadway', gdk_broadway_sources, gdkconfig, gdkenum_h, include_directories: [confinc, gdkinc], - c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'], + c_args: [ + '-DGDK_COMPILATION', + '-DG_LOG_DOMAIN="Gdk"', + '-DG_LOG_USE_STRUCTURED=1', + ] + common_cflags, + link_args: common_ldflags, dependencies: [gdk_deps, gdk_broadway_deps]) # gtk4-broadwayd diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index ff5674f0e8..1753ef9050 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -99,5 +99,6 @@ libgdk_wayland = static_library('gdk-wayland', '-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_USE_STRUCTURED=1', - ], + ] + common_cflags, + link_args: common_ldflags, dependencies: [ gdk_deps, gdk_wayland_deps, ]) diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build index ca63423bdb..5cc6e98d39 100644 --- a/gdk/x11/meson.build +++ b/gdk/x11/meson.build @@ -74,5 +74,6 @@ libgdk_x11 = static_library('gdk-x11', '-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_USE_STRUCTURED=1', - ], + ] + common_cflags, + link_args: common_ldflags, dependencies: [ gdk_deps, gdk_x11_deps, ]) -- 2.30.2